Code revisions by Mike Zimmerman